Merge "Merge "docs: corrected code example mistakes" into oc-dev am: 5714da6e93 am: 1ed1ee3c70 am: 735aa14f4e" into oc-mr1-dev-plus-aosp
am: 91f0c696da

Change-Id: Id39d77ad8e3d4a238506d23da48c5dcc055ebf3b