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

Change-Id: Ic62dc4341f09ae325d1de7c6dc58cfad486a959f