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

Change-Id: I2182d8d1a82d1fa729d1251df2d88ec6f9eaa5be