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

Change-Id: I514b670dfed23fecebd5b3f67ab47e2940fa341b