Merge "Clean up RemoteCallbackList when we're done with it." into pi-dev am: bbe6ee065d
am: c549c7e7b4

Change-Id: I7ec7e84936023149cee82190b3213a4838604080