Merge \"Merge \\"Merge \\\"App launch - Test app changes\\\" into nyc-dev am: 8fabbb89c0\\" into nyc-mr1-dev am: 3998b7a54b\" into nyc-mr1-dev-plus-aosp
am: fbf5611d31

Change-Id: I6689ae61fe863eb9fa4264be485e7c48c71c5620