Merge "ContextHub: Avoid reference leaks" into nyc-mr1-dev
am: 6bf3424ccf

Change-Id: I8f4c4c76f458420eb76b260a0b356c25e440a45b