This reverts commit 5b817e64. Reason for revert: No longer needed Bug: 203231943 Change-Id: I220ff6b2033cadf7b29f1bc4a68bec50900f2aef