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

Change-Id: If54a4f4d8ed5e882b38ab475b68f6e312c9423f1