Merge "Change initialize methods in sample apps" into oc-mr1-dev
am: df95894d96  -s ours

Change-Id: Ia48d6e8a31afaa1ef52e41c99ea791c34676e101