This reverts commit 39c9570d. Reason for revert: Caused Regression Bug: 147361175 Test: Revert Change-Id: Ie20016db65319b53017cc6fbc92d99527f4cef88