Merge cherrypicks of ['googleplex-android-review.googlesource.com/21408331', 'googleplex-android-review.googlesource.com/21987133'] into sparse-9719927-L31500000959114895.
SPARSE_CHANGE: Iddb8619be7bdd9767211e44913e8ba3871bc6580
SPARSE_CHANGE: Ifa80de5b64d98240119ffb0cd01769afdcd14076

Change-Id: I4ecf867cb69f39e8c4087afc0b87f8d721b1e6e3