Merge cherrypicks of ['googleplex-android-review.googlesource.com/24018523', 'googleplex-android-review.googlesource.com/24185697', 'googleplex-android-review.googlesource.com/24374051'] into sparse-10750477-L35700000962882213.
SPARSE_CHANGE: I82a61ec7c74690f30af32ff2e48f69fb91d0062c
SPARSE_CHANGE: Ib78cdb211e25b1ae28d120a974514de4c6db8d43
SPARSE_CHANGE: I4890e0ed2191993887aa550053a827c2aca3aafe

Change-Id: I622bee47a1e09a1251e460dad3276f3081b28b5b