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

Change-Id: I15264d21377f5b5ab65130a87290cc10143ed49e