Merge \\"Enable the demo launcher package as well.\\" into nyc-mr1-dev am: b5b2c196a8
am: be22429bb6

Change-Id: Iba60a6a38d756141328597be8098eec6a0e24926