This reverts commit d5992e681f. Reason for revert: ijpedowitz@ Bug: 77662908 Change-Id: I596d330d64942105f447bb613012bb11e281a805 Exempt-From-Owner-Approval: keep tests passing
d5992e681f