Merge cherrypicks of ['googleplex-android-review.googlesource.com/24407407'] into sparse-10753542-L37600000962888753.
SPARSE_CHANGE: I5e7ecc45c732b5711d076b1e5783355a07c92846

Change-Id: I2cbf9ce2206465fc8909d2d0ff6cb8d959ab2c9b