Merge "Updated tutorial content for the public OC release am: 70c0925f25 am: 21f405614d" into oc-dr1-dev-plus-aosp