Merge "ContextHubService: Avoid null pointer dereference" into nyc-mr1-dev