Merge "Change NetworkTimeUpdateServiceImpl behavior"