This reverts commit 706bb3e9. Reason for revert: Cause tests fail Fix: 191338484 Change-Id: I7a5fb1fa31be2cb52c440dc64f91a83548bcc230