Merge "Add 'dash' as a compatible brand" into oc-dr1-dev am: 5d6cc7d118 am: d107b790bf
am: 5f25b6c906

Change-Id: If0fa4a5b9a4633d872de4b5b3072283b2f432d50