Merge "Fix build break in log statement"