Merge \\"Error colors to point to frameworks rather than hard-code them\\" into nyc-mr1-dev am: 948400a43d
am: 85d688cd79

Change-Id: I214563e1cd9ad44c99ea34c5480bc7ab1814a975