Merge cherrypicks of ['googleplex-android-review.googlesource.com/21050546'] into sparse-9662652-L34400000958984256.
SPARSE_CHANGE: I7795abe0aebefca2d42998a672abfd12f951d501

Change-Id: Ie572a0ae8ae4d687b86ea6a4011b4fdc33b43cd7