Merge "Error colors to point to frameworks instead of hard-coding them" into nyc-mr1-dev