This reverts commit ec43a01e. Reason for revert: Added missing code. Bug: 115837065 Test: m test-art-host Change-Id: Id30ccdf9aa9a6e56a914254793e399f2712c882d