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

Change-Id: I7d6dd491fe56ea6a7af7bb8cd105ba616826fc40