Merge cherrypicks of ['googleplex-android-review.googlesource.com/23452552'] into sparse-10216780-L93500000960937337.
SPARSE_CHANGE: I2693b422c57aefcd39d48797ca155cadff17cb35

Change-Id: I31dd48ee54b8e543b416595e176adb4a52fd1f46