This reverts commit aaa56842. Bug: 64478820 Test: builds Change-Id: Ia7fcdc834135d60e4b3c80432b8f0ac8b1df3b75