Merge "Update margins to match specs" into nyc-mr1-dev