Merge cherrypicks of ['googleplex-android-review.googlesource.com/23447960', 'googleplex-android-review.googlesource.com/24154592'] into sparse-10615697-L60900000962405601.
SPARSE_CHANGE: Ic437ff4d19cbd5764635f3007d99880622150f5b
SPARSE_CHANGE: Ic33dc94806b838a03a2203bdd5701a1eeaeeb7bf

Change-Id: I8eadeecea932cad65ff512b1dd944f1e2f0dcde4