Updating all apps to match spec

Change-Id: Ie351fdea2e3b05ca911e6533f0c5d00c17e0847c
10 files changed