aml_art_341311100 (11341323,com.google.android.art,com.google.android.go.art)
Merge cherrypicks of ['googleplex-android-review.googlesource.com/25421978'] into sparse-11150270-L12000030000611359.
SPARSE_CHANGE: Ie29f457fcaf795a9c024f6fdd8ae0cbf161e36d7

Change-Id: Idd95e47784f934db8611195ea5de7327b102221f