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

Change-Id: I136a624dee3557e3db5348563985a430fd02d23b