Snap for 11178562 from cdc09741206fb925d251feaa137d7e31f4c4ba02 to mainline-art-release

Change-Id: I74d6cdbd095231f7ca30317fc5f200e99e67dcc4