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

Change-Id: Ie447b8094ca9c483aac3886c795240301b5f2ace