Merge "Merge "docs: corrected code example mistakes" into oc-dev am: 5714da6e93 am: 3311ba316a am: 1181c6895c" into oc-mr1-dev-plus-aosp