Merge "Fix the alarm timing so that it uses absolute time." into mnc-dev