This reverts commit ba15db8f. Reason for revert: broke CTS tests Change-Id: I8c3997d0944c359edb4adfa2127530be8dea6f21