Merge "Use ConvertibleTimestamp::convert() in a few places"