Merge cherrypicks of ['googleplex-android-review.googlesource.com/23447960'] into sparse-10656238-L18400000962566963.
SPARSE_CHANGE: Ic437ff4d19cbd5764635f3007d99880622150f5b

Change-Id: I0425d8869040ec5ff020c95a21f396bf60000e6d