Merge "Merge "docs: fixed a couple of typos" into oc-mr1-dev am: 651ffd426c am: 9a2d959eff am: affc3087f5"