Merge "Make tenant_network_mask_bits default setting consistent"