Merge "sepolicy: perf related policy changes"