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

Change-Id: Id29ca197e27a5e82d880ac87737132a07f012982