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

Change-Id: I75081f01f4ebcd6c0e74250f261e43b712e22d80