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

Change-Id: I83d3402a76330795a3fa72c38c6bfa39af4f23bd