Snap for 10453563 from 4e6f332ae08065111779ca948ba959dc8111d891 to mainline-art-release

Change-Id: Ib946f334bd711e27dd979f03f655dbaa6ccae23b