Merge "Include timestamps in trunk API test comparisions"