Merge "Change initialize methods in sample apps" am: dd18156f65 am: db6ee7c15d
am: c240acc1a6

Change-Id: I0cfa7f8d714cda639d1c8bcbd4b35b11da5adff1