Merge "Adding some formatting tests for TimeUtilsTest" am: 941037c0cd
am: 2ec08d16bf

Change-Id: Ia5e483cbcbb3791ce3260212f9fd84be2d88c84c