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

Change-Id: I609defbb1df83dc9510ee59dd857fd5e69ce43fb