Merge cherrypicks of ['googleplex-android-review.googlesource.com/24018523', 'googleplex-android-review.googlesource.com/23728264'] into sparse-10750477-L71800000962881354.
SPARSE_CHANGE: I82a61ec7c74690f30af32ff2e48f69fb91d0062c
SPARSE_CHANGE: I35a0a13558f1db5960d2f50a43875564e1c6ea05

Change-Id: I88b80917464e045db80d4a6cc795e476d290702c