Merge cherrypicks of ['googleplex-android-review.googlesource.com/24778419'] into sparse-10683547-L40900000963064768. SPARSE_CHANGE: I48ef806f9f3ad4f5edb96b8f83a5bd23e04c22c6 Change-Id: Ie6db9d6241417e4d03bf11f579fc548f9ddc3e17