Merge "Workaround string-plus-int warning"
am: 0771b752f1

Change-Id: I8d54690771c35612a15712ee9d260f82d76671ae