Merge "Updates DataLayer example." into oc-mr1-dev