7444e309f9
This reverts commit 0ace970e1997c91b1b105eb3e326963bc04164d3. Bug: 174932174, 175111824 Exempt-From-Owner-Approval: refactoring with team leads buy-in Change-Id: I152186408ecf6da1cb7354d14737de7cce55a34b