Merge cherrypicks of ['googleplex-android-review.googlesource.com/24439886', 'googleplex-android-review.googlesource.com/24439885'] into sparse-10740638-L17800000962853027.
SPARSE_CHANGE: I860de9766063f9674a6b4a9fd2d2deeea3e1b8f0
SPARSE_CHANGE: I073e25b8e4db19f9680e4ef7cda6baa7c265b925

Change-Id: I3a1ab109d212a7cf666f622e3af8a9e7e2cd5d10