Merge "Normalize timestamps in host java libraries"