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

Change-Id: I4d6cc69b51906b2515d3ddb45f56e28f118ad579