am 15b1322f: am 9354a3ac: Merge "Show better error message for color attr not found." into mnc-dev

* commit '15b1322f54144ae58bd20f772515d2fe785fce81':
  Show better error message for color attr not found.