Merge cherrypicks of ['googleplex-android-review.googlesource.com/30284816'] into sparse-12553254-L49400030007650015.
SPARSE_CHANGE: Ie011c5ffbf94f284f7ad16f2fa0f566efe51dd51

Change-Id: I8183a2b9533efd9721b8e539d461e1c6455748d0