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

Change-Id: I384350abb6feb12beee8b7788b3d577593eec763