This reverts commit e5cad56d. Reason for revert: b/156746781 Change-Id: Ib5134cc1ee1382053d193b33769634b5ad11a0bb Bug: 156746781