Merge "Change NetworkTimeUpdateServiceImpl behavior" am: 48247d9223 am: f11a45b756 am: ef100e45fe

Change-Id: Ie4ab2ecaa0778fa6ff7d75e5677dfb4bed1d443d