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

Change-Id: I284e113c8f0154032dc54fd3e2053aefa5f78503