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

Change-Id: If49b4ffddb6e578d82c1ad4b6c26f8153bb48a3a