Merge changes from topic "presubmit-am-e743e17e9016460ba59c5e44ff871904" into tm-mainline-prod

* changes:
  [automerge] Fix color lint 2p: e706ccc59a
  Fix color lint