Merge changes from topic "embms-cherry-pick" into oc-mr1-dev

* changes:
  Make changes in sample download service for adjustments
  Adjust sample app for API changes