Snap for 7692221 from 91c67215e53b8a6ce9dcf4575df253c4070b07da to mainline-art-release

Change-Id: Ie25cd5a335fb7ff81e3122a312576c0984ce5259