Merge cherrypicks of ['googleplex-android-review.googlesource.com/27801400'] into sparse-11963768-L37300030004576966.
SPARSE_CHANGE: I384699d478e5abcee3a165afc45211b9ed96334a

Change-Id: Ibfa47f6e519bb1da2c663f85e22ee043704c72a1