Merge changes I1476a938,I111189d1

* changes:
  Add shell command to gnss_time_update_service
  Refactoring to ease cherry-pick