This reverts commit 50350c15. Reason for revert: Break build. BUG: 120869311 Test: N/A Change-Id: Ida39fa1e0a3e75001af19adb5cf330d1be26af64