Merge "Fix the reference leak on RemoteCallbackList" am: be30d27a8a
am: ea493e4c77

Change-Id: Iffc4beb2fd5c30a35a744c133186826cd7f487b8