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

Change-Id: I5d5a0b1a348d2245c24e7feb758042037533c0f5