Merge "Normalize timestamps in host java libraries" am: 90edf85667 am: adb96ae66a am: 62ba92c898
am: 61e47461c9

Change-Id: Idee2916fec234276cc6ad7406f022b8401bdefd8