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

Change-Id: I9dbfb6b90c90f37c744632c4fa22417f4c1de3d0