Merge "add test for binder inheritance." am: 058ee272fd am: a0eba13bf5
am: ebfee10ee2

Change-Id: Ia41b7baa17a5540acb8bf3fe5fbf79742a4cccfb