Merge \"App launch - Test app changes\" into nyc-dev
am: 8fabbb89c0

Change-Id: I0b14fe4a4dd9414d9fe9d15980e8058a7b3d9e29