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

Change-Id: I6c27278a131447c4b1943291e23cf755cba0829c