Merge "PM / Sleep: Implement opportunistic sleep, v2"