This reverts commit a7b599b8. Reason for revert: Possible cause of b/175685062 Change-Id: If9a4592fa1c8e4c97ae187e45b509c3753d2f47e