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

Change-Id: I684c5bee80097b2ce0f6a3722ef1a338fbac7e26