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

Change-Id: Ic4ccbe9e1f8908cb35bd9285bee3bbf738dd6ed5