Merge "Avoid NetworkPolicyLogger NullPointException"