Merge "Fix NetworkPolicyManager unit tests." am: da3518bc6b
am: 1381de466a

Change-Id: I474180a603338a1f980b327f183dac8131577330