Merge "Refactoring to test NetworkTimeUpdateService"