Merge "ContextHub: Avoid reference leaks" into cw-f-dev
am: efdd4ac34b

Change-Id: I05f09b52140d307980c5fabfd0f7a2395d750340