Merge "Add test config to binderAddInts" am: d89f0cb87b am: 33e29525e2
am: 8288531a14

Change-Id: I00dfaece3d4178fa99edba39496887d20941190e