Merge "Mandatory concurrent stream combinations should be generated by metadata-generate." into rvc-dev