aml_art_331711080
Snap for 8564071 from 52d28f0aa58271e0ec8ba83b88d2a2a6842a2273 to mainline-art-release

Change-Id: Ic48706a114b0dae07692f7aba2bf6a7380f1f328