Merge cherrypicks of ['googleplex-android-review.googlesource.com/24405206'] into sparse-10750268-L29600000962889056.
SPARSE_CHANGE: Ie95d32418e5d16a10d3eeab462df857094b730c6

Change-Id: Ie975b2ddf9eded88da884b7406bc6012c8894cf3