Merge "ContextHubManager: Avoid bad NanoApp objects" into nyc-dev
am: f4d3805

* commit 'f4d380537a2d52c147d5c69d8ec124529fa4f7e6':
  ContextHubManager: Avoid bad NanoApp objects

Change-Id: Ie66a50ba0bdf10fcf4dfb91acfd5d1cd276dda88