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

Change-Id: I3b0d7800b94f7f00c42da8d1206cb026ac5c7a2d