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

Change-Id: I510705eb4917a56edb74e8f2754c7229338a9f1d