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

Change-Id: I0f578a45ae736ce6e2e6f3ca7585e8f64a7eb36b