Merge "Use ISO 8601 format for LocalLog local timestamps"