Merge changes from topic "qemu_sbsa" into integration