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

Change-Id: I312e265e479c44fb569614ccf77c34ceb9bf174c