Merge "EMBMS - Add TestApi and provide service override"