Merge "Merge remote-tracking branch 'origin/caf/kernel-bridge-utils/master'"