aml_art_341411300
Snap for 10453563 from 71bd08cc6680df301723d4bd4624caadde3d2f8f to mainline-art-release

Change-Id: Ibe53cea754fae74e4c1e1f159bded941ca66e658