This reverts commit ab4ed116. Bug: 73102865 Change-Id: I029064d144b891cb6eefacc2ad648a821fa49ec0 Test: rebuild