Merge cherrypicks of ['googleplex-android-review.googlesource.com/24972970'] into sparse-10913515-L52600000963378420.
SPARSE_CHANGE: I2373ecef880c0671bbb418f95c5d3174e546306a

Change-Id: I4607c33fa6775fd58306bc022df4ab8a261ef3b8