This reverts commit c5e0476b. Reason for revert: breaks wakeup Bug: 185681677 Change-Id: I61b12a006415bfd406e8f54db1bc0fe459e1ec0f