Merge "Drop setting of in_qemu boolean and restorecon /sys/qemu_trace."