Those APIs should look at the device associated with the stream first. If that stream is null then get the current device ID. Change-Id: Iedde1d1644818ba64f128b988f0bd9674f5b8ad6
Change-Id: Ib160fbf89ec89a5895321f73402a33b4d344a68f
Change-Id: Iabaab4e72815ba483a1330ec6a1130f2b86676f0