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

Change-Id: I2db25d72c0a3ced209559afb0af5e5f1b5380ec6