Merge "Fix FLAG_PRIVILEGED numbering"