Merge cherrypicks of ['googleplex-android-review.googlesource.com/25834525'] into sparse-11480754-L62600030002545018.
SPARSE_CHANGE: Ic8ac68d21c64a909a1035339d36f9c3b50a8963c

Change-Id: I3f0b066c5301ace78e9a179d130eaa9e2c60e334