Merge "Expose netId by adding getter API"