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

Change-Id: Iff90737a3d2ade86e8cbf7ac1a2663c4e886e285