aml_art_341514410 (11532129,com.google.android.art,com.google.android.go.art)
Merge cherrypicks of ['googleplex-android-review.googlesource.com/26110884', 'googleplex-android-review.googlesource.com/26137234', 'googleplex-android-review.googlesource.com/26050822'] into sparse-11275214-L79500030001813416.
SPARSE_CHANGE: I42b87d1c536d48b3ded43d81527bc4fbd26fbd98
SPARSE_CHANGE: I7737c74fefb8fb468bd123c31838e1264f85dacd
SPARSE_CHANGE: I78b737bb05678b155e17aeeca19f5319437f9353

Change-Id: I6eb931a7e3b637484518b6890022326f5912054a