This reverts commit 6c0ea5e6. Reason for revert: breaks on restricted manifests Bug: 116674705 Change-Id: I71d501dccc17aae6be4523695a66309240076d69
mentioned in commit f1d10506