Merge "Calculate timestamp using local time zone in system update unit tests" into pi-dev