aml_art_340915060 (10774978,com.google.android.art)
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24194466', 'googleplex-android-review.googlesource.com/24210863'] into sparse-10570663-L16200000962456493.
SPARSE_CHANGE: I783973b74e55b17665970fe0d726c6f47db927cb
SPARSE_CHANGE: I78016d48a14f7fa0087877e83e3d076a2a6caf83

Change-Id: I8043a2802900ac32bf0a4eea891d2a7a797072c8