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

Change-Id: I6442883f1e356e24036973ccbfcd7b76a452be4d