Merge "NetworkPolicy: Replace fake allLocks" am: 1afa2c413e
am: bd37561226

Change-Id: I1e77ef4a361d7167c1336fb15563fbb036463713