This reverts commit c3b5583c. Reason for revert: Investigating b/194395139 Change-Id: I4700271436dd21fc08f093ee5f9964c855de600a