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

Change-Id: Id0fbe60ce32e431ee9234c012287d71a58ba3eeb