This reverts commit af8b9503. Reason for revert: Broke the build, see b/269687118 Change-Id: I6f7fac0e24c710bd00af77e4d96c845eefe0a9ce