Merge cherrypicks of ['googleplex-android-review.googlesource.com/23042196'] into sparse-10035943-L45700000960441785.
SPARSE_CHANGE: I25e7f7c481bf3327846ebf94cc09a79562dab6fc

Change-Id: Ia569d02574927490fbe3a11bf3aed548a6c939b5