Merge \\"Revert \\"Revert \\"Error colors to point to frameworks instead of...
Merge \\"Revert \\"Revert \\"Error colors to point to frameworks instead of hard-coding them\\"\\"\\" into nyc-mr1-dev am: d739ea38
am: 1da5d326
Change-Id: Iff841d790e9c840a5b24c82740b802d538c930e1