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

Change-Id: I1d185c385184ec5b396516c965923d7e1180dbd8