Merge \\"Revert \\"Error colors to point to frameworks rather than hard-code them\\"\\" into nyc-mr1-dev am: 22d09743d8
am: aa79a3c135

Change-Id: I53e9a848b90254c2bafd84342293265f7c6997b5