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

Change-Id: I304e8791b2ea72bd527fa0c8abd2c748c90e866c