Merge "Return generic Binder on onBind"
am: c6613f7206

Change-Id: Ibc8cce3c63b93820f6bdd842e6a751233240874d