Merge cherrypicks of ['googleplex-android-review.googlesource.com/25983001'] into sparse-11344512-L86400030001654717. SPARSE_CHANGE: If77a097b4ca823322ef41b13d6283390dac69d6c Change-Id: I922006fd4327ff72194c2b2a05f935181e92e088