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

Change-Id: Ic7bd40f2a1fe95eae275dbd0580d7acd283ffca7