Merge cherrypicks of ['googleplex-android-review.googlesource.com/22861203'] into sparse-10161073-L49900000960778179.
SPARSE_CHANGE: I52f9a11b1dd78a5e5dbb1bbde3cda7381c87ae39

Change-Id: I293fca48382fcd71a6f055e9c140a183c2c33fdf