aml_art_331813100 (10345260,com.google.android.art)
Merge cherrypicks of ['googleplex-android-review.googlesource.com/23591859', 'googleplex-android-review.googlesource.com/23602892'] into sparse-10224456-L58600000961157013.
SPARSE_CHANGE: I549694c20c66e59844031556afa7c725f897ecdf
SPARSE_CHANGE: Ib56183a735d57f41b33b12344e37935404171d77

Change-Id: I9b14076fb8eda97a126126066075cdc14f89eb1b