Merge "Fix demo launcher" into nyc-mr1-dev