Merge \\"Revert \\"Revert \\"Error colors to point to frameworks rather than hard-code them\\"\\"\\" into nyc-mr1-dev am: 9e7bd8de87
am: 250664a032

Change-Id: I07908d20c83232ef91b7c45cb772d066584c33a0