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