Merge cherrypicks of ['googleplex-android-review.googlesource.com/24028888', 'googleplex-android-review.googlesource.com/24028889'] into sparse-10502572-L39700000962039696.
SPARSE_CHANGE: If7e9e5f99728c2f3a18b08346b4cf3449132f920
SPARSE_CHANGE: If0736e504928641c85934eae4d298f14e711116c

Change-Id: Ia90e3f84f6772d746c8707476e9ca2de19f17aec