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

Change-Id: I6870aa057452312fe33e34e5879b1575f4fa2c71