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

Change-Id: I1807793eb3212f2156aba87bd0f1ff180fba2033