Merge "ContextHubService: Don't change app handle on load" into nyc-mr1-dev am: a519a5fb34
am: f48f7fcc82

Change-Id: Id291ce256778a355e620e2de66a7621e83bd0841