This reverts commit 5d3ec54b. Reason for revert: Breaks a SdkSandboxManagerTest Change-Id: I30c03d70a2b683f663b00866035ebf56339a4b0b