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: Ifb2a86c905711d5272bd0caff51ee20a71a13ed4