Merge "Make changes to sample apps to reflect 7/28 adjustments"