[automerger skipped] Merge "DO NOT MERGE Fix color_lint errors" am: fcaf926dc1
-s ours am: 6e65a32468
-s ours
am: 9fe69d724d
-s ours
Change-Id: If7f67c5a8f32045dd9e1b63f61614b03cfbd9bed
This commit is contained in: