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

Change-Id: Idb5094bfaab92982890c13dc9639ab45480acad6