Follow-up to commit 542451cc. Bug: 30373134 Test: m test-art-host Change-Id: I1d0202896e683cb20db30e8aac1c5ebcacc96467