[automerger skipped] Merge "Fix missing combination check SINK/DEVICE" am: 25a7e6ed25 am: a890cc7c97
am: 450a526608 -s ours
am skip reason: change_id I5e652fbf9313bd2c122fe728d58e577085632253 with SHA1 665eb216e5 is in history

Change-Id: If0d75b0ed5bd2afbfe1d05cf388b3f0a2cc74b70