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

Change-Id: I5384e7415b308a8c809e908bf3bdf5f1364f9391