frc_340819280 (11225212,com.google.android.art,com.google.android.go.art)
Merge cherrypicks of ['googleplex-android-review.googlesource.com/25131756'] into sparse-10836955-L20400000963648685.
SPARSE_CHANGE: I0c2ab75e2e1b558849631688a0b272e0475a8420

Change-Id: I85770c49b3146195fa03a42d144231801c01c97d