Merge "Revert "Revert "Error colors to point to frameworks rather than hard-code them""" into nyc-mr1-dev