Merge cherrypicks of ['googleplex-android-review.googlesource.com/32157258'] into sparse-13150826-L06100030010209915.
SPARSE_CHANGE: Ib02fd0b3dfd354e53ff7e6d6d352d3e91933b3ea

Change-Id: I1f6427b14b3492f350faacb3944e092d5780e5d2