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

Change-Id: Iedd4b456c8f807bdf20c705ed122249f274f7e4f