Merge "Merge "docs: corrected code example mistakes" into oc-dev am: 5714da6e am: 3311ba31" into oc-mr1-dev