Merge "Updated tutorial content. am: 5ace35a419 am: 3fb4dccb6b" into oc-dr1-dev-plus-aosp