Merge "ContextHubService: Hack around 32-bit app ID" into nyc-mr1-dev