Merge cherrypicks of ['googleplex-android-review.googlesource.com/26247218'] into sparse-11480754-L62600030002545018.
SPARSE_CHANGE: I5ebc65fcd00c7d5c593f8a56c8ccdfd424551005

Change-Id: Ia80f451eb8a2f6fa63187de49ae6c7cdbc209aef