Merge \"Fix demo launcher\" into nyc-mr1-dev
am: 644dd1aa45

Change-Id: I92cce4e457b9d3110c1421b0393c6e9481338a40