Merge "Change initialize methods in sample apps" into oc-mr1-dev