Merge "Modify sepolicy for compos key changes"