Merge "Add OrSelf to privileged permission check." into mnc-dev