Merge changes I36636687,I4c45f787 into oc-mr1-dev

* changes:
  Doc updates
  Translate default channel on locale change