Merge "OsTest: Manually fix up formatting."