Follow-up to commit 9ea84d0b. (cherry picked from commit 8f81de5e) Bug: 73667005 Test: m test-art-host Merged-In: I77cc688a35fc9413eca4c352f88d2b31e8ca11d1 Change-Id: I77cc688a35fc9413eca4c352f88d2b31e8ca11d1