Merge "Add 'dash' as a compatible brand" into oc-dr1-dev am: 5d6cc7d118 am: 38d841eafa
am: 7232ea7497

Change-Id: I46e6bf79030cada8790ae3d7814accbe7c2aae54