Merge "Add 'dash' as a compatible brand" am: 7937b6bb18
am: 0377dccbf8

Change-Id: I631278692ac2374ce49cdcf262a524bbdab258d6