Merge "Change the logcat dump to use UTC time" into main