[automerger skipped] Merge "Update color-check-baseline.xml" am: 81cb8a2612  -s ours am: 3461bd0644  -s ours
am: 2b976cce96  -s ours

Change-Id: I73a07959ae2ce9fa968af7cada9f0c943ed63c18