Merge "ContextHubService: Avoid null pointer dereference" into nyc-mr1-dev am: a630b2d667
am: 0bde8e0c14

Change-Id: I03d1f8264aa9d54aa0bda21e850e021699ebb9d3