Merge "Modify sample apps for API adjustments"