Merge cherrypicks of ['googleplex-android-review.googlesource.com/23401198'] into sparse-10167124-L44700000960899180.
SPARSE_CHANGE: Ia1523d9c7795dc93a56b4fd57735de9285d396bb

Change-Id: I064576c1fe73b3244f45cf68f16f15af1350f27e