Merge cherrypicks of ['googleplex-android-review.googlesource.com/21694103', 'googleplex-android-review.googlesource.com/22076527'] into sparse-9719927-L87300000959339500.
SPARSE_CHANGE: Ie93e0825ac210b938faa700066a6972172ee47a2
SPARSE_CHANGE: I8cae3edca3791483df502ae0dbaa24c59e151537

Change-Id: If16a4b532157ff16903c2fc8cb61a7a5ee014087