Merge cherrypicks of ['googleplex-android-review.googlesource.com/26348042'] into sparse-11555370-L22300030002426335.
SPARSE_CHANGE: I32258500ec02c2a8cbfc6d0b37aaea2c83c7c8b4

Change-Id: Ie3fff8163866f5782a5eab5ae3968b790e273a94