Merge cherrypicks of ['googleplex-android-review.googlesource.com/23425558', 'googleplex-android-review.googlesource.com/23657636', 'googleplex-android-review.googlesource.com/23657637'] into sparse-10218840-L32600000961329322.
SPARSE_CHANGE: Ib688e37103e6b8fa34d7e468481906ecc95ffaf2
SPARSE_CHANGE: I5214dc1a9a28b826d2b4889db393e5980cc33a7e
SPARSE_CHANGE: I6b927fb0774df9fead255716d3f6ed45453ed3ea

Change-Id: I942a8c9ab6e87f156aec50f69dcc479e12e3bb06