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

Change-Id: Ibeca72659bbd13b1a5a8bdb009fc6a5021f8acbf