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

Change-Id: Ieb7ba5442904354b25156b817e8a48e5c1a09697