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

Change-Id: I88c8abd5c1d3fec72f73d439253341b1c9ce778a