Merge changes I2a808b9f,I8cbd4651

* changes:
  Implements queryNanoApps API
  Implements the new loadNanoApp/unloadNanoApp APIs