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

Change-Id: Iabbac6600bddf7f723185ee0b0d9611f36e2c9df