Merge "Add location backed system clock"