Merge cherrypicks of ['googleplex-android-review.googlesource.com/22904199'] into sparse-10019883-L95000000960319046.
SPARSE_CHANGE: Ia887bd2ad00900eaad5f8fb34ed73ffcdf9f783a

Change-Id: If7de16e18792badc4023a426a852eea70482a9ae