Merge "ContextHubService: Hack around 32-bit app ID" into nyc-mr1-dev am: a97c9617ae am: 43e4df0517
am: 42de4dd1aa

Change-Id: I8a9f2ea89fe05fd3b69b24dea7a8755eefd608df