Merge cherrypicks of ['googleplex-android-review.googlesource.com/28906069'] into sparse-12301355-L56800030006212796.
SPARSE_CHANGE: I413a7406ce57799059e791a51e9b09a0a6eeafb6

Change-Id: Ida93a4b8a01533c208f72a7127cca50bad534ef7