Merge "Suppress -Wstring-plus-int warning"
am: 63c89a37fd

Change-Id: I99867a9a01c569e4ca9316046775ca415f41a727