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

Change-Id: If4e352d5124948fad2e9d26a9b4f583ca4af7730