Merge cherrypicks of ['googleplex-android-review.googlesource.com/23242222', 'googleplex-android-review.googlesource.com/23341876', 'googleplex-android-review.googlesource.com/23341877'] into sparse-10133821-L55900000960787963.
SPARSE_CHANGE: Iac3e857c1c1bd2ceda0f111798a18daf869d8e04
SPARSE_CHANGE: I49536497997e4c81caac6fc5eaec9de52b771863
SPARSE_CHANGE: I2f4da49583a7f66ed9bf58e1f934ba37e61b8586

Change-Id: I27980aad5c10acac48c9765f9b8f26f3a1b93998