Merge "Make date consistent with spec when alarm is set" into lmp-dev