Merge "Merge "docs: corrected code example mistakes" into oc-dev am: 5714da6e93 am: 3311ba316a" into oc-mr1-dev
am: 56891ed4d4

Change-Id: I31457c4a0ce4a821c3b92d4dc961a6aafe8c42de