Merge "Mark shell as system_executes_vendor_violators."