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

Change-Id: I6ff5b0272b5fc6be67646d68d007d6d34fd91e46