Merge "update time while network is connected" am: 465f8527dd
am: 56ebd7daeb

Change-Id: Ia9287a828d40696f180599d58fbf1b4f0aea5449