Merge "XMPValidate: Use ConvertibleTimestamp instead of wfTimestamp()"