This reverts commit 068978ca. Reason for revert: breaks wakeup Bug: 185681677 Change-Id: I100846a4698f89ee9bd65492986643c11dc21a8b