This reverts commit dfbad4ce. Reason for revert: <Phone Crashes> Test: manual Change-Id: Ic77628d4c12d33108785159099d7b531c368d23a