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

* commit '4aa4238a6264d6c894c5ba90deb570aaa014405b':