This reverts commit abde85cc. Reason for revert: broke StagedInstallTest b/157859022 Bug: 157859022 Change-Id: I5843c38745d8979574e5aff17f41ab21dfea7f9f