Correctly parse colours defined as "#..." or "#...." am: 1ec150e514 am: 50808e1afa am: 9ff78e1d06

Change-Id: Ifc82e007d8f684537f635290aadb488bf855c87b