Fix Bus register/unregister balance.

Change-Id: Ifbf29ed08d577ebfa34e655bb6ba62017ed46c9a