Follow-up to commit 8f2c6d47. Test: m test-art-host Change-Id: I67bf92067509ddf658fc22e333430fa5ee44f6ea