Merge "[binder]: Correct the index for getReturnString" am: a340838895 am: 3a3ed21bac
am: 218d4e6ce5

Change-Id: Ibbe6406b6feff62dce7193c13de0bbaacceb48a8