Merge "Suppress -Wstring-plus-int warning"