Merge \"Add a resource for demo mode launcher component name.\" into nyc-mr1-dev
am: 4ee33795c4

Change-Id: Ib5d7aef5453afbd0468da7adfc99055d082d7e23