This reverts commit 775b70ec. Bug: 72047557 Bug: 116174409 Test: Builds successfully Change-Id: Ib915cf293c2c98db9fedecd3b9c9cbdf5e79f200