Merge "Change signature|system permissions to signature|privileged"