Note, This reverts commit bd62d6af. Bug: 64800246 Test: compilation Change-Id: I709d4c476647cfe9f6b982fc373f8d76018b3922