Merge "OMS: Add config_signature policy handling"