Merge "Correct namespace in update-vfw-op-policy.sh" into beijing