Merge "Fix usages of deprecated methods in support-design code." into nyc-mr1-dev