aml_art_331711080
Snap for 8564071 from a7af87e5bf47a1b3ae2945c09f466d476d89a229 to mainline-art-release

Change-Id: Ia1c797cea5c34f418f95808a030bfb6682e4a8f8