Merge "Return generic Binder on onBind" am: c6613f7206 am: 2a71bd5150
am: 2fca3afd4b

Change-Id: Ic668d9bb43f58f28c096083f89c6bec30cf9640a