Merge "getStreamingServices for embms" am: b73fe9a751
am: 1d274ca5ec

Change-Id: Iabec728e0525a0c8d4cf0b8a2627e9198fa0f5c5