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

Change-Id: Icdcffd62883657879c9d80ba703260f36217d286