This reverts commit 9b1e9550. Reason for revert: Breaks many tests Bug: 164982975 Change-Id: I86e7b158ae593aab6d73950bbb2b9dc6a7d5093c