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

Change-Id: Ifcab24e9faaac9c7c50515e5fe9b09944b43cd65