Merge "NetworkPolicy: Replace fake allLocks"