Merge "Modify sample apps for API adjustments"
am: 3e5d2b8274

Change-Id: Ic0cd27d7ee618088f4ee4ba61d38e87b5eb5a820