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

Change-Id: Iae264aed02535b758f97a8fcf4fb8614d121793f