Merge cherrypicks of ['googleplex-android-review.googlesource.com/27202159'] into sparse-11799897-L62100030003582657.
SPARSE_CHANGE: I2a66651f935923623bea269aabea7476720573b1

Change-Id: I9d0b0a6d3070dfd1398a3eccbf8677af22f5de2f