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

Change-Id: I2937d91954470f2b28e4e719ae82139bd622084f