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

Change-Id: I04db61709bec5bc5dfabafb22e3b7e562bcac037