Merge "Replace getNetworkPrefixLength() with public API"