Merge cherrypicks of ['googleplex-android-review.googlesource.com/22462863'] into sparse-9935876-L59500000959911030.
SPARSE_CHANGE: Idd9386c9de7743909103405a7367e69e10f1b6ab

Change-Id: Id4530857c4cf38f7f33acb4d46733338638291b3