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

Change-Id: I5c44393e98c432b3c7a28c7b5b1906aa80f62372