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

Change-Id: I5388bfae6263442a0a86162a857b238a1b300847