This reverts commit a1145a1f. Reason for revert: fix build failure Bug: 295779471 Change-Id: Id481aa628e1a1173b8b2c79006843025439b5901