This reverts commit dd16d44f. Reason for revert: multiple build breakages b/137069068 Change-Id: If48bfa2d2cab0877a053743b3ec53820d0c4ed6b