Merge "ART: Tentative fix for stack count issue in test 913" am: 8af5efdb1d am: fb449e46d6
am: cd873c16bf

Change-Id: Ie2885d928e48ec9829d6a39c30f51fb0445570b0