Merge "AOD: Fix time tick alarm registration"