Merge "Tweak logged info for time / time zone detection" am: 142a3f86e3 am: 4e76706b1d am: 3d82574f6b

Change-Id: I16f625b0751d299074b0eca2a15de6b1ab97692c