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: 9e1a5df4
Change-Id: I6d04460fc0777575080b3968c515c93364987155