Merge "Fix missing combination check SINK/DEVICE"
am: 25a7e6ed25

Change-Id: I3b8e25d60b051785c486555176472fd072163885