Merge "Fixed timeline for uploaded trace + dump files."