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

Change-Id: Ia7407f60bc7a1dd82f6af03f5c9f44e2f2f41108