Merge "fix(versal-net): remove_redundant_lock_defs" into integration