Merge \"Fix comment. The color is cyan 500 not teal.\" into nyc-mr1-dev
am: bff9c1ab30

Change-Id: I1ce07ac6c8fffa1317ddd7e703cb5fe75dc26558