Merge cherrypicks of ['googleplex-android-review.googlesource.com/23231863'] into sparse-10161073-L49900000960778179.
SPARSE_CHANGE: I2f9275ef117caa93c09d4d24e3a17f588e4ca600

Change-Id: Icacd1e2d988c1aa101c3b2a992242ba220673603