Merge "Add skip-secondary flag" into nyc-mr1-dev