Merge "Make changes to sample apps to reflect 7/28 adjustments" am: 1c4c9b331e am: 8d48ad27e3 am: 6a47ea70c9
am: 47e3f719bf

Change-Id: Ifa99b45dea86213236b6bb9c86764f27b3ccc92c