Merge cherrypicks of ['googleplex-android-review.googlesource.com/23263658'] into sparse-10316531-L04200000962983271.
SPARSE_CHANGE: I8783b2ce5be4af9e24d6ffa4bca81b23a64e0700

Change-Id: I5b9a08e2e78a5ebec8140e80d27138621ad088ea