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

Change-Id: I787658a004873e5650cf885483528f867a00b7ab