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

Change-Id: I2bf5228e659dfeff032f1972eeecd8545d853bb9