Merge "Fix format-pedantiic warning"