Merge "EMBMS - Add TestApi and provide service override" am: 1fab41e771
am: dfc37f77c9

Change-Id: I3ecc9c267fa7f107a11bc9e1a4fbdb6c2772ec20