Merge "Fix format warnings"