Merge cherrypicks of ['googleplex-android-review.googlesource.com/23447960'] into sparse-10644925-L16700000962543246.
SPARSE_CHANGE: Ic437ff4d19cbd5764635f3007d99880622150f5b

Change-Id: I858cb023d2e533c56209e724e603d8a310931074