Merge cherrypicks of ['googleplex-android-review.googlesource.com/26050935'] into sparse-11372776-L23600030001700473.
SPARSE_CHANGE: I02ff505a6a82c0c715e39d884dd738aa30244a82

Change-Id: Ib6f9eca5b769d104e5b8795ff5eed8dd72fefe9c