Merge "Flesh out streaming service management in service" am: 0268750a94 am: 3e58025f05 am: eaedffb2ef
am: dbe9ce135b

Change-Id: Ib81c91a4f58c95e9e1266a49bd92071f29a55c79