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

Change-Id: I14154508510d04cc39a52fc6128492b531f712b5