Merge commit '53e501cfb3b26edd65a91ff404283de67e0bcbc1' * commit '53e501cfb3b26edd65a91ff404283de67e0bcbc1': Unhide NETWORK_TYPE_XXX.
Merge commit '53e501cfb3b26edd65a91ff404283de67e0bcbc1' * commit '53e501cfb3b26edd65a91ff404283de67e0bcbc1': Unhide NETWORK_TYPE_XXX.