am fb109ca9: (-s ours) am c04c3af8: Merge "Fix the alarm timing so that it uses absolute time." into mnc-dev

* commit 'fb109ca90b255c0be8fb0b1d8a7af279c0ab273e':