This reverts commit 6192687591. Reason for revert: needs security review. Bug: 118835348 Change-Id: I89dc98ac5464960430abd318c47e30788fee1565
6192687591