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

Change-Id: I0dcb59ede3af0d610b79a4b610eb89e4121e2dc7