Merge change 9004

* changes:
  Fix NullPointerException when checking if its a sinkDevice.