Merge "ContextHubService: Hack in Google vendor value" into nyc-mr1-dev