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

Change-Id: I77fab1beead68551d5a69b0f46275e515c4eabc5