Merge "[DO NOT MERGE] Only setSize if -s arg is specified" into nyc-mr1-dev