This reverts commit c1016fbd. Reason for revert: Breaks CTS Bug: 119867084 Bug: 113373927 Bug: 121149887 Change-Id: I310a341e0ea225bc9c98ba09d4452d9fbd4e49ad