Snap for 10453563 from 624004eddc53bc7af079355587d2a31d29e7d374 to mainline-art-release

Change-Id: I032f541c6922c8719868b418ffb54ab2bbf3d003