Merge "Alter CTS tests for new EMBMS APIs"