Merge "Mandatory concurrent stream combinations should be generated by...
Merge "Mandatory concurrent stream combinations should be generated by metadata-generate." into rvc-dev am: af0910c0 am: 83ea2351
Change-Id: I39d08148a5390e2ba075d17cbd3d8d677daf064a