Merge cherrypicks of ['googleplex-android-review.googlesource.com/31154470', 'googleplex-android-review.googlesource.com/31569659'] into sparse-13010343-L69700030009374823.
SPARSE_CHANGE: I9a5a75420a76ff0aefab2e2f9b14770fd7b2ad7a
SPARSE_CHANGE: Ie732cbab915573f8693ca3ddc83a25e044a96cbf

Change-Id: I4f85ab429ca9e56561c932e7a9e6c7a9b68c80ec