This reverts commit 39347367. Reason for revert: Breaks image_space_test on target. Bug: 112827048 Change-Id: Ia3b2e93c2d075a4cd7093df4e1674cadb83ce560