Merge "API: Update api-help-datatypes for Timestamp library changes"