Merge "AOD/LS - Fix 24 hour clock" into sc-dev