Merge "Rename getAllNetworkStateSnapshot which should be pluralized"