ContextHub: Avoid reference leaks am: 52dda59896
am: 76f65ce9ac

Change-Id: I2035ff4ee44051d9e7b562a2fdad49271c3efb89