Merge "Merge "docs: corrected code example mistakes" into oc-dev am: 5714da6e am: 1ed1ee3c am: 735aa14f" into oc-mr1-dev-plus-aosp