Merge "ContextHub: Avoid reference leaks" into nyc-mr1-dev am: 6bf3424ccf am: 34230195ab
am: 05f7e7aedf

Change-Id: I145a9a8655bdba5fa2af745db9c8c358d96efe79