Merge "Adding device-idle policy time to alarms"