Merge "Change 'red' to 'amber'" into nyc-mr1-dev