Merge "Revert "vsoc_x86_64 also has "overriding commands" warnings on master""