aml_art_341110060 (11088951,com.google.android.art,com.google.android.go.art)
Merge cherrypicks of ['googleplex-android-review.googlesource.com/25145418'] into sparse-10882210-L16500000963768039.
SPARSE_CHANGE: I0c2ab75e2e1b558849631688a0b272e0475a8420

Change-Id: If9da1cf9007b17cc114fc6879a8085377d483a16