Merge cherrypicks of ['googleplex-android-review.googlesource.com/31637513'] into sparse-13018634-L05100030009413150.
SPARSE_CHANGE: Id1da2bce7689a41e1154272e8032526d171183f5

Change-Id: I14c16acf12b86fc6fa7040c5397a4e55790f0ab7