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

Change-Id: I592b6dc9a5915ae882e25c4b357afa20ff998b97