Merge "Fix NetworkPolicyManager unit tests."
am: da3518bc6b

Change-Id: I4caf3995143b5dc63925e64a05dd9dd94deec636