Merge "Add NetworkTimeUpdateService" into nyc-dev