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

Change-Id: Ifc8c16ec3926b14d558692d830adbc78e5438d3d