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

Change-Id: If9ecb061e33ef7913aa482f41eabf6b870bc5dab