This reverts commit 925c6586. Reason for revert: Causing WindowManager pre-submits to fail. Change-Id: I11dfc87e7fb2741b237688865eeefbd9e29dc981