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

Change-Id: Id880fa64d540526ad095f1a7cbfab88e185041e1