Merge cherrypicks of ['googleplex-android-review.googlesource.com/24697428'] into sparse-10873617-L67100000963226378.
SPARSE_CHANGE: I36c2925303fecddc613d25e34faaada5d5ed4485

Change-Id: I2b29175486cfb4ebc414db11ce3badce52c2e32f