Correctly parse colours defined as "#..." or "#...." am: 1ec150e514 am: 2531023f15 am: dd4419ffce am: c1273a0f9e

Change-Id: I47781d802e9c770282b22ff83eed69d2720d540c