Merge cherrypicks of ['googleplex-android-review.googlesource.com/30779229'] into sparse-12545800-L12600030008266990.
SPARSE_CHANGE: I94456a1c7387ed2c75bfb3ab3c6698738d22f598

Change-Id: I2db7e2cc2371b1cc79270f2369f6f9b0b6af4a93