Merge "ContextHubService: Maintain hub result meaning" into nyc-mr1-dev am: 18e59f2988
am: d06faffad8

Change-Id: I68d8d5463e73c5a30ea18f0009f7e7f48d28a0df