Merge cherrypicks of ['googleplex-android-review.googlesource.com/23425558', 'googleplex-android-review.googlesource.com/23443369'] into sparse-10218840-L71800000961211347.
SPARSE_CHANGE: Ib688e37103e6b8fa34d7e468481906ecc95ffaf2
SPARSE_CHANGE: I7c3354b0832668c1d721d085f39434cd328e045a

Change-Id: I7eabc9ab866180c4f377d9c164b1203a2fec735f