Merge "sepolicy for server configurable flags"