Merge cherrypicks of ['googleplex-android-review.googlesource.com/26942860'] into sparse-11704978-L55100030003094529.
SPARSE_CHANGE: I3cd81b65f943d4ab6c5d981dbe6e9d5bf336e612

Change-Id: I12bca400bbed2f0cb05a4d0645c4d2172b1259d2