Merge "Fix calendar alarms not being triggered after 22h" am: 3525221de1 am: 0fa463b835
am: ac20c8eede

Change-Id: I75b3d0e014ba7f37cdd59eca7243a720147d2cd9