Updating all apps to match spec
am: 310a988993

Change-Id: I2ca6afbc3de70dfa76f61c1799c3e700c3f94870