Merge "Tweak logged info for time / time zone detection" am: 142a3f86e3

Change-Id: I8346420788fda6617e1eb0db8566a762b7af31d1